Revert "objectManager: handle proxies coming and going"

This reverts commit 1ef626213952ea8568bb35ec0e96788a696d1fee.

https://bugzilla.gnome.org/show_bug.cgi?id=772589

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index c1f8341a92ab2017cca493c16b4dea6f540c3748..225204347a444a4df314d69811e12b103e78dac4 100644 (file)
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -46,7 +46,7 @@ const ObjectManager = new Lang.Class({
                                                  g_interface_info: ObjectManagerInfo,
                                                  g_name: this._serviceName,
                                                  g_object_path: this._managerPath,
-                                                 g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
+                                                 g_flags: Gio.DBusProxyFlags.NONE });
 
         this._interfaceInfos = {};
         this._objects = {};
@@ -65,9 +65,6 @@ const ObjectManager = new Lang.Class({
     },
 
     _tryToCompleteLoad: function() {
-        if (this._numLoadInhibitors == 0)
-            return;
-
         this._numLoadInhibitors--;
         if (this._numLoadInhibitors == 0) {
             if (this._onLoaded)
@@ -89,7 +86,7 @@ const ObjectManager = new Lang.Class({
                                        g_object_path: objectPath,
                                        g_interface_name: interfaceName,
                                        g_interface_info: info,
-                                       g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
+                                       g_flags: Gio.DBusProxyFlags.NONE });
 
         proxy.init_async(GLib.PRIORITY_DEFAULT,
                          this._cancellable,
@@ -184,18 +181,6 @@ const ObjectManager = new Lang.Class({
             return;
         }
 
-        this._managerProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-            if (this._dbusProxy.g_name_owner)
-                this._onNameAppeared();
-            else
-                this._onNameVanished();
-        }));
-
-        if (this._dbusProxy.g_name_owner)
-            this._onNameAppeared();
-    },
-
-    _onNameAppeared: function() {
         this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) {
             if (!result) {
                 if (error) {
@@ -228,21 +213,6 @@ const ObjectManager = new Lang.Class({
         }));
     },
 
-    _onNameVanished: function() {
-        let objectPaths = Object.keys(this._objects);
-        for (let i = 0; i < objectPaths.length; i++) {
-            let object = this._objects[objectPaths];
-
-            let interfaceNames = Object.keys(object);
-            for (let j = 0; i < interfaceNames.length; i++) {
-                let interfaceName = interfaceNames[i];
-
-                if (object[interfaceName])
-                    this._removeInterface(objectPath, interfaceName);
-            }
-        }
-    },
-
     _registerInterfaces: function(interfaces) {
         for (let i = 0; i < interfaces.length; i++) {
             let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);